remove leftover conflict marker.
authorMatthias Clasen <matthiasc@src.gnome.org>
Sat, 20 Apr 2002 23:59:48 +0000 (23:59 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Sat, 20 Apr 2002 23:59:48 +0000 (23:59 +0000)
commit06008057b6d1ea26f2a077612fc9e0455bb200c2
treee5e79d78568d08185b47423e6bf61f16212748bd
parent4138ac479b4521b28c3b8cb9ebd45347a1221de4
remove leftover conflict marker.
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8